Deprecate gtk_box_pack_{start,end}_defaults

svn path=/trunk/; revision=20786

diff --git a/ChangeLog b/ChangeLog
index 0069cdd8c59b97894a3364ffd7643d84d6489cca..943ccc1c1126278e2f5343caa328603e29a4c235 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-06  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 540917 – deprecate pack_start_defaults()
+
+       * gtk/gtk.symbols:
+       * gtk/gtkbox.[hc]: Deprecated gtk_box_pack_{start,end}_defaults.
+       Proposed by Owen Taylor
+
 2008-07-05  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 41f9644f0111be4666c974381fac15a4b9637f09..9a25a7872627726560c55a0d6a9ffa898b7fb289 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -412,9 +412,11 @@ gtk_box_get_homogeneous
 gtk_box_get_spacing
 gtk_box_get_type G_GNUC_CONST
 gtk_box_pack_end
-gtk_box_pack_end_defaults
 gtk_box_pack_start
+#ifndef GTK_DISABLE_DEPRECATED
+gtk_box_pack_end_defaults
 gtk_box_pack_start_defaults
+#endif
 gtk_box_query_child_packing
 gtk_box_reorder_child
 gtk_box_set_child_packing

diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index f78e88388ffba9a0814cc3e8a06af755f16128a0..409761614e9492eeceba87acdf51eafcd765b4a4 100644 (file)
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -441,6 +441,8 @@ gtk_box_pack_end (GtkBox    *box,
  * Parameters for how to pack the child @widget, #GtkBox:expand, 
  * #GtkBox:fill and #GtkBox:padding, are given their default
  * values, %TRUE, %TRUE, and 0, respectively.
+ *
+ * Deprecated: 2.14: Use gtk_box_pack_start()
  */
 void
 gtk_box_pack_start_defaults (GtkBox    *box,
@@ -461,6 +463,8 @@ gtk_box_pack_start_defaults (GtkBox    *box,
  * Parameters for how to pack the child @widget, #GtkBox:expand, 
  * #GtkBox:fill and #GtkBox:padding, are given their default
  * values, %TRUE, %TRUE, and 0, respectively.
+ *
+ * Deprecated: 2.14: Use gtk_box_pack_end()
  */
 void
 gtk_box_pack_end_defaults (GtkBox    *box,

diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 28d42a3e374c3d7cdda3e2942e0b5944487382bf..9ab9df2eb6976f90158e284b4f6948b21e77e0fa 100644 (file)
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -88,10 +88,12 @@ void           gtk_box_pack_end            (GtkBox       *box,
                                        gboolean      expand,
                                        gboolean      fill,
                                        guint         padding);
+#ifndef GTK_DISABLE_DEPRECATED
 void      gtk_box_pack_start_defaults (GtkBox       *box,
                                        GtkWidget    *widget);
 void      gtk_box_pack_end_defaults   (GtkBox       *box,
                                        GtkWidget    *widget);
+#endif
 void      gtk_box_set_homogeneous     (GtkBox       *box,
                                        gboolean      homogeneous);
 gboolean   gtk_box_get_homogeneous     (GtkBox      *box);